gpspilot.c magnav.c : use waypt_disp_all instead of explicit loop.

diff --git a/gpsbabel/gpspilot.c b/gpsbabel/gpspilot.c
index f5ecb22456344cb8f7ae6bd7d526640b2b03aab1..bfa9b57285b4ccc9719dbb2352ec668d520c2bb0 100644 (file)
--- a/gpsbabel/gpspilot.c
+++ b/gpsbabel/gpspilot.c
@@ -123,7 +123,7 @@ data_read(void)
 
 
 static void
-gpspilot_writewpt(waypoint *wpt)
+gpspilot_writewpt(const waypoint *wpt)
 {
        struct record *rec;
        static int ct = 0;
@@ -177,7 +177,6 @@ gpspilot_writewpt(waypoint *wpt)
 static void
 data_write(void)
 {
-        extern queue waypt_head;
        queue *elem, *tmp;
 
        if (NULL == (opdb = new_pdb())) { 
@@ -191,9 +190,8 @@ data_write(void)
        opdb->type = MYTYPE;
        opdb->creator = MYCREATOR; 
        opdb->version = 0;
-        QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-               gpspilot_writewpt((waypoint *)elem);
-       }
+
+       waypt_disp_all(gpspilot_writewpt);
        
        pdb_Write(opdb, fileno(file_out));
 }

diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c
index c32f67f04695c14e99ce179681edf634cd93eeb2..01395ea95916569dbe5b095a4c29c466f8e8410c 100644 (file)
--- a/gpsbabel/magnav.c
+++ b/gpsbabel/magnav.c
@@ -137,7 +137,7 @@ data_read(void)
 
 
 static void
-my_writewpt(waypoint *wpt)
+my_writewpt(const waypoint *wpt)
 {
        struct record *rec;
        static int ct;
@@ -215,7 +215,6 @@ my_writewpt(waypoint *wpt)
 static void
 data_write(void)
 {
-        extern queue waypt_head;
        queue *elem, *tmp;
 
        static char *appinfo = 
@@ -252,9 +251,8 @@ data_write(void)
        opdb->version = 1;
        opdb->appinfo = (void *)appinfo;
        opdb->appinfo_len = 276;
-        QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-               my_writewpt((waypoint *)elem);
-       }
+
+       waypt_disp_all(my_writewpt);
        
        pdb_Write(opdb, fileno(file_out));
 }